From c963ffa8b400db6c906f3a262ae96694f0fd728e Mon Sep 17 00:00:00 2001 From: robertlipe Date: Mon, 8 Jul 2013 22:33:43 +0000 Subject: [PATCH] Don't potentitally double-quote icons in KML writer. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4413 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/kml.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/gpsbabel/kml.cc b/gpsbabel/kml.cc index c4dc0ab30..d62b82226 100644 --- a/gpsbabel/kml.cc +++ b/gpsbabel/kml.cc @@ -1548,15 +1548,11 @@ static void kml_waypt_pr(const waypoint* waypointp) if (waypointp->hasLink()) { writer->writeEmptyElement("snippet"); if (waypointp->hasLinkText()) { - // FIXME(robertlipe): these call to xml_entitize are suspicios with - // new XML serializer. - char* odesc = xml_entitize(waypointp->url.toUtf8().data()); - char* olink = xml_entitize(waypointp->url_link_text.toUtf8().data()); + QString odesc = waypointp->url; + QString olink = waypointp->url_link_text; writer->writeStartElement("description"); writer->writeCDATA(QString("%2").arg(odesc, olink)); writer->writeEndElement(); // Close description tag - xfree(olink); - xfree(odesc); } else { writer->writeTextElement("description", waypointp->url); } @@ -1575,7 +1571,7 @@ static void kml_waypt_pr(const waypoint* waypointp) writer->writeStartElement("Style"); writer->writeStartElement("IconStyle"); writer->writeStartElement("Icon"); - writer->writeTextElement("href", icon.toUtf8().data()); + writer->writeTextElement("href", icon); writer->writeEndElement(); // Close Icon tag writer->writeEndElement(); // Close IconStyle tag writer->writeEndElement(); // Close Style tag -- 2.30.2